Add support for chip variants and new ESP32P4 #333
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This pull request introduces comprehensive support for chip variants in the ESP32 Arduino library builder, enabling differentiation between configurations of the same target (e.g., esp32p4 vs. esp32p4_es). The changes update build scripts, CMake configuration, and CI/CD workflows to use a new CHIP_VARIANT variable alongside IDF_TARGET, with automatic fallback to maintain backward compatibility.
Key changes:
- Added
CHIP_VARIANTparameter handling throughout the build system, extracting it fromconfigs/builds.jsonand defaulting toIDF_TARGETwhen not specified - Introduced new ESP32-P4 early silicon variant (
esp32p4_es) with dedicated configuration and build definitions - Updated all shell scripts to accept and use
CHIP_VARIANTfor output paths and logging
Reviewed Changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| build.sh | Extracts chip_variant from JSON config, uses CHIP_VARIANT for builds and path resolution, updated logging |
| CMakeLists.txt | Passes CHIP_VARIANT environment variable to all custom commands (libs, bootloader, mem-variant) |
| tools/config.sh | Adds CHIP_VARIANT fallback logic and updates SDK paths to use variant instead of target |
| tools/copy-libs.sh | Adds CHIP_VARIANT as second parameter, shifts other parameters accordingly |
| tools/copy-bootloader.sh | Adds CHIP_VARIANT as second parameter, shifts flash mode/freq parameters |
| tools/copy-mem-variant.sh | Adds CHIP_VARIANT as second parameter, shifts oct flash/psram parameters |
| configs/builds.json | Adds new esp32p4_es target entry with chip_variant field and specific build configurations |
| configs/defconfig.esp32p4_es | New configuration file for ESP32-P4 early silicon with ESP-Hosted-MCU, Bluetooth, display, and USB settings |
| configs/defconfig.esp32p4 | Adds explicit disable of early silicon revision selection |
| .github/workflows/push.yml | Adds esp32p4_es to build matrix targets |
| .github/workflows/cron.yml | Adds esp32p4_es to scheduled build targets |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces support for handling chip variants in the build system, making it possible to distinguish between different configurations of the same target (e.g.,
esp32p4vs.esp32p4_es). The changes update scripts and configuration files to consistently use the newCHIP_VARIANTvariable, ensuring builds, outputs, and configurations are correctly associated with the intended variant.Build System Updates:
build.shandtools/config.shto extract and usechip_variantfromconfigs/builds.json, defaulting totargetif not specified. All build and config operations now referenceCHIP_VARIANTinstead of justIDF_TARGET. [1] [2] [3]CMakeLists.txtto passCHIP_VARIANTto scripts, ensuring the correct variant is used during library, bootloader, and memory variant copying. [1] [2] [3]Configuration File Changes:
esp32p4_esinconfigs/builds.json, enabling builds for this chip variant with its own features, libraries, bootloaders, and memory variants.configs/defconfig.esp32p4_esfor the new variant with specific configuration options, including ESP-Hosted-MCU, Bluetooth, display, and USB settings.Script and Variable Renaming:
tools/copy-libs.sh,tools/copy-bootloader.sh,tools/copy-mem-variant.sh) to acceptCHIP_VARIANTas an argument and use it in output paths and logging, replacing previous uses ofIDF_TARGET. [1] [2] [3]tools/config.shto useCHIP_VARIANTfor SDK paths and platform definitions.Logging and Output Improvements:
targetandCHIP_VARIANT, improving clarity during multi-variant builds. [1] [2] [3] [4]Default Configuration Handling:
CHIP_VARIANTis not set, it defaults to the value ofIDF_TARGET, maintaining backward compatibility.These changes collectively enable robust multi-variant support in the build system, making it easier to manage and build different configurations for the same hardware target.
Connected to espressif/arduino-esp32#12036